Makefile changes and directory structure

Support for cgroups directory structural changes