Combine Angular components and organise folder structure