I completed changed the file structure... hopefully for the better