Changes directory organization - sorry :)
merged