added keywords to config, rebuild the assets structure, divided includes and other minor fixes