fix folder layout, move modifications