Simplify structure
Made files print alphabetically
More caching and version bump