Organize folders and stuff
Merge pull request #2 from ofeldberg/Omer-Branch

Organized folders and stuff