reverted dir structure because i am doing things in an other way as i thought i would.