Renamed derp sources.
fixed requires after rename.
Merge branch 'feature/restructure' into develop