Trying to correct directory structure again without losign files.
Merge branch 'master' of https://github.com/stewartbryson/gcbc

Conflicts:
	gcbc_initial.rpd
	gcbc_master.rpd