Project structure adjusted

- Project structure adjustments.