Moving libraries to their own subfolder
First pass at Import/Export (needs more testing)