Added more composer information.
More refactorings and renamings.
Removed a previous test file that got in by accident.