restructuring files and cleaning up
Restructuring again. Fixed problem when voting