Rearranged project structure, added hspec runner