Project structure changed, some other minor changes