Cleaned up directory structure and added a few files