Reorganization of src folder for github.com