added include files and updated folder structure