basic control implemented, refactoring, less files