Add files from PC
Refactor to clean dir hierarchy