Cleaned up the main directory and changed the naive property name