Move resource files to separate directory
Finish mapping 'g' package and remap a load of jdt classes