fixed problems, cleaned up folder structure