More changes to composer file, and restored old structure