file heirarchy reorganization
class renaming