Merge pull request #28 from raistlinthewiz/develop

Re-organized folders as I'll be adding a json-rpc getwork server & servi...