working on reorganizing
reorganized and cleaned file directories
merge conflicts
finished reorganizing for now and updated readme
Versioning to swithc branches
removed incorrect lines
reorder one line that was breaking server
resolved merge conflicts nad merging reorganizing stuff