Moved loading into seperate libs