Temporarily relocating this directory
Added more advanced library constructs