Added a proper structure and src file