[REFACTOR] Project structure improved