Move some files into subfolders to make it neater
Clean up views and add view content