I was just seraching through cvs contrib to see what was 1.5 compatible and it looks a little messy in there 
. As more upon more contributions are made would a different structure be better?
Perhaps different folders for 1.4.x and 1.5.x code? Also, perhaps within those folders some way of keeping blocks and mods apart? 
Darren