folder structure changed, makefile updated
more folder structure changes
restructuring