Restructure again, libraries will be separate for now