Move dir

Better strucutre