organizing source files into sub directories, working on the object and primitive classes