Changed configuration and directory structure