Refactoring

Fixed issues #16 (closed), #11 (closed) and #6 (closed).

The test folders are missing as we do not have any tests yet. Same for the main config (top level config folder)