Reordered project structure ..