reorganization of project into modules, removed unused files