Composer file modifications. New class structure