modules and template now in applications, fix bootstrap