File cleanup
Added file organization
Resolved merge conflict with gh-pages branch