refactoring controls directory, working basic controls