re organize stuff

reorganized stuff