origanise into dir based structure