Fixed some project structure and config errors