#5: Reorganize directory structure. Separate core library from web service