Removed extraneous files and code.
Rejigged folder structure to make things clearer