Major code cleanup...

Still need to do more cleanup, also added empty Illustrator file for
mocking up the UX.