Refactor angular folders