Code Restructured As per KnpBundles Specification