Add front end folder
Merge
Delete old folders