Structure

Modifying project structure