Add files and change structure
Finish skeleton