re-arranged the directory structure a bit