Remove unused code
change directory structure