moved to src folder, removed old classes