Refactoring

Renamed, deleted, moved and reorganized several files and folders to
improve consistency and organization.
Merge branch 'master' of https://github.com/aaronhallink/Instagrub

Conflicts:
	index.php