Updated with basic structure and make file