Moved code around, multiple libraries