Changed project directory structure slightly