Project stucture reworked