Partition interfaces with folders
Convert static utility methods to extension methods