Re-factored some of the scss files

This is a simple app and does not require a very elaborate style folder structure.
Also, removed backup files that were accidentally checked in before.