Change the folder sctrucutre

A lot of changes
Change a lot