Improve framework: group assets, file class, etc.