Cleaned up hierarchy and names to ensure the project can be built