Moved folders around

Due to filesystem restrictions, multiple folders have to be created.