done project structure rearrangement