Started to de-template the project