Removed unnecessary files generated by scaffolding, and general clean-up.