Improving project structure & minor changes