removed unused files, refactored structure