Merge pull request #20 from adamreis/samara

Final commit
Changed file structure so it could run on clic machines