refactor loading
add source folder, corresponding Makefile