merging

Changed everything to 1 directory to make it more easy
added fix