Reorganized folders into src
Modified files to conform to the reorganization