Add files and reorganize