Convert back into single project structure. Let's keep it simple