Revised structure for scripts and styles, updated datasource configuration