Big refresh of the project