Restructured files
Project restructured