PSR2 fixes mostly
Changed project structure to better match other FH projects.