Re-Structured for new loader-class

Works sometimes, needs debuging in the Input-part.