reorganized helper functions, less global
merged Kiran's & Harshit's changes, reorganized folder structure for easier updating, cleaned up resources
rebuilt