Added base folder structure, nobody wants a file soup...