merged src/java and src/rsc