[fix/folders] Fix folder structure as mentioned by nickvergessen