! refactored, removed project structure