Factored out settings files
Removed some unnecessary files...