changed: new project folder structure