refactored names and dir structure
imported new control