remove unused code
re-arrange the directories (no code changes)