cleanup
Refactoring. Splitted in files..