- refactoring & unused files removed