Merged code into angular-seed structure