Cleaning the code

Killed former structure and set up new one. Restart from header.