Arranged the directory structure, removed the base split just doesn't fit here. added comments