reorganiing code
re-orging