Structure changes

Changed project structure to a more familiar setup.