Reorganized files for deploy