Start to refactor code, move images, build to separate folders