reorganized directory, refactored controllers, added syle