Project: reorganized folder structure