restructuring according to angular-seed conventions