Trim extra spaces around class names
Reorg frame files
Use require in the frame