Project reorganisation

Signed-off-by: notrodash <n@notr.co>
Merge branch 'master' of https://github.com/notrodash/URL-Badmans--YRS-2014-