Code refactoring: organized some of the classes into more meaningful directories