Flattened package structure. Added libraries.