Rspec tests added. Reorg folders
Merge branch 'develop'