Started changes to porject structure