Moved Some stuffs

Hope to do not did a mess :-P