Reorganized file structure
Merge branch 'master' of https://github.com/dferrer/Boulder
Reorganized file structure