changing directory strucutre for easier mainteance