beginning massive code refactor
rename again
More file changes, include composer and stuff
oh god what have I done