Move files under src/NAMESPACE folders
Update include paths for files under src
Adjust Makefile for new file locations