Re-arranged directory structure, solidifying API ideas