Done: Rearrange file and folder structure; modify makefile to make it work