refactor project structure: removed unused files and some renames