Modified project structure and small fixes