Removed modules, fix branding and update build process