Continuing to update project structure