Re-organizing and fixing git organization

Previous folder/directory changes have caused issues with git; now
fixing