New directories

Moved reources to the reource folder and maps to the maps folder, does
it need to be explained.
Merge remote-tracking branch 'origin/master'