organized code a bit
changed views to have file structure