rearrange folders and began writing rspec tests for users