Re-factoring of project structure