Change project structure for the 10th time ;)