Restructured files and added css