reorder guide + update project structure