Restructure project
Display a better message