Restructured to make root directory cleaner