organisation and cleaning

Added some basic settings and organisation for future upgrades/modification.