Angular Version: files reorganised.