Cleaned up hierarchy and extra file