First commit - project structure & some minor changes