Development 0.5

Pulling back because changes are minor and more folder structure related.