refactored files and variables
removed old file