File structure and files reworked...again to a more organized format to begin.