Restructured libraries for IntelliJ use