Reorganize and Add files