re-arrange directory structure
re-arrange directory structure