Refactored structure of project