Implemented  value setting and improve the project layout