Changed project structure;