draft: restructure files