Cleaning up dir structure and code base