Organized libraries and build targets; Improved modules