Cleaning up class names and dir structure