adding the doctrine yaml association and cleanup some imports