Changed project structure, added spray project