Restructured code base
Moved settings around
More restructuring